Skip to content

Use already available curl and consistent code style#843

Merged
tianon merged 2 commits into
docker-library:masterfrom
J0WI:curl
Jun 25, 2019
Merged

Use already available curl and consistent code style#843
tianon merged 2 commits into
docker-library:masterfrom
J0WI:curl

Conversation

@J0WI

@J0WI J0WI commented Jun 17, 2019

Copy link
Copy Markdown
Contributor

No description provided.

@yosifkit

Copy link
Copy Markdown
Member

I'm half tempted to just remove curl (and keep the add/remove of wget since it cleans up better than curl in Debian) since I can't see a good reason why it was kept installed. It was first kept installed in #9 and was questioned when added initially to alpine in #202 (comment).

Does php itself (or pecl/pear) use curl directly or is it only via libcurl?

Though we probably wouldn't be the only dependent image that assumes curl exists. 😢

@tianon

tianon commented Jun 19, 2019 via email

Copy link
Copy Markdown
Member

@J0WI

J0WI commented Jun 19, 2019

Copy link
Copy Markdown
Contributor Author

curl is also used in tests:
https://github.com/docker-library/official-images/blob/4e2b0889b438fad2b0ad5fc3d2f2f018d544afcc/test/tests/wordpress-apache-run/run.sh#L6-L7

For Alpine most wget use cases are already covered by BusyBox (edit: see docker-library/rabbitmq#344).

@J0WI

J0WI commented Jun 19, 2019

Copy link
Copy Markdown
Contributor Author

it cleans up better than curl in Debian

Maybe this has been enhanced?
apt install --no-install-recommends curl installs 26 packages on debian:stretch-slim and only 16 in debian:buster-slim. apt purge --autoremove curl removes them correctly.

@J0WI

J0WI commented Jun 22, 2019

Copy link
Copy Markdown
Contributor Author

The transition to Alpine 3.10 (#845)/Debian Buster might be a good chance to remove curl in favor of libcurl.

@tianon

tianon commented Jun 25, 2019

Copy link
Copy Markdown
Member

That's a good idea -- perhaps we should also do so for 7.4-rc+, although I think this is enough change for one PR (I added a few extra bits and did a rebase). 👍

@tianon
tianon merged commit 2e2df06 into docker-library:master Jun 25, 2019
@J0WI
J0WI deleted the curl branch June 25, 2019 22:47
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 26, 2019
Changes:

- docker-library/php@2e2df06: Merge pull request docker-library/php#843 from J0WI/curl
- docker-library/php@250c2d8: Add "set -u" and more consistency
- docker-library/php@82d590a: Use already available curl and consistent code style
- docker-library/php@c0f68b2: Merge pull request docker-library/php#845 from J0WI/alpine10
- docker-library/php@27cfb71: Update default to Alpine 3.10
- docker-library/php@3802051: Add Alpine 3.10
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 26, 2019
Changes:

- docker-library/php@04e67dc: Merge pull request docker-library/php#850 from petk/patch-php-7.4-alpha
- docker-library/php@820403d: Also remove "update.sh" bits for ARGON2 hack removal
- docker-library/php@894ee59: Remove the Alpine argon2 library fix
- docker-library/php@2e2df06: Merge pull request docker-library/php#843 from J0WI/curl
- docker-library/php@250c2d8: Add "set -u" and more consistency
- docker-library/php@82d590a: Use already available curl and consistent code style
- docker-library/php@c0f68b2: Merge pull request docker-library/php#845 from J0WI/alpine10
- docker-library/php@27cfb71: Update default to Alpine 3.10
- docker-library/php@3802051: Add Alpine 3.10
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Jun 27, 2019
Changes:

- docker-library/php@bbcc3db: Update to 7.4.0alpha2
- docker-library/php@eaa29e4: Merge pull request docker-library/php#851 from infosiftr/with-pear
- docker-library/php@e2331f5: Add "--with-pear" in 7.4
- docker-library/php@04e67dc: Merge pull request docker-library/php#850 from petk/patch-php-7.4-alpha
- docker-library/php@820403d: Also remove "update.sh" bits for ARGON2 hack removal
- docker-library/php@894ee59: Remove the Alpine argon2 library fix
- docker-library/php@2e2df06: Merge pull request docker-library/php#843 from J0WI/curl
- docker-library/php@250c2d8: Add "set -u" and more consistency
- docker-library/php@82d590a: Use already available curl and consistent code style
- docker-library/php@c0f68b2: Merge pull request docker-library/php#845 from J0WI/alpine10
- docker-library/php@27cfb71: Update default to Alpine 3.10
- docker-library/php@3802051: Add Alpine 3.10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants